summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFernando S <fsahmkow27@gmail.com>2022-10-24 12:41:46 +0200
committerGitHub <noreply@github.com>2022-10-24 12:41:46 +0200
commit2e782a154dccaf4761487f1a17f11b610bca3dc2 (patch)
tree2dafbe96fa1893a89667da6031dce9542f8534cb
parentMerge pull request #9105 from Morph1984/warnings (diff)
parentnvdrv: fix container destruction order (diff)
downloadyuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.tar
yuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.tar.gz
yuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.tar.bz2
yuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.tar.lz
yuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.tar.xz
yuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.tar.zst
yuzu-2e782a154dccaf4761487f1a17f11b610bca3dc2.zip
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.cpp2
-rw-r--r--src/core/hle/service/nvdrv/nvdrv.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/nvdrv.cpp b/src/core/hle/service/nvdrv/nvdrv.cpp
index 9d9924395..9f4c7c99a 100644
--- a/src/core/hle/service/nvdrv/nvdrv.cpp
+++ b/src/core/hle/service/nvdrv/nvdrv.cpp
@@ -53,7 +53,7 @@ void InstallInterfaces(SM::ServiceManager& service_manager, NVFlinger::NVFlinger
}
Module::Module(Core::System& system)
- : service_context{system, "nvdrv"}, events_interface{*this}, container{system.Host1x()} {
+ : container{system.Host1x()}, service_context{system, "nvdrv"}, events_interface{*this} {
builders["/dev/nvhost-as-gpu"] = [this, &system](DeviceFD fd) {
std::shared_ptr<Devices::nvdevice> device =
std::make_shared<Devices::nvhost_as_gpu>(system, *this, container);
diff --git a/src/core/hle/service/nvdrv/nvdrv.h b/src/core/hle/service/nvdrv/nvdrv.h
index 146d046a9..f3c81bd88 100644
--- a/src/core/hle/service/nvdrv/nvdrv.h
+++ b/src/core/hle/service/nvdrv/nvdrv.h
@@ -97,6 +97,9 @@ private:
friend class EventInterface;
friend class Service::NVFlinger::NVFlinger;
+ /// Manages syncpoints on the host
+ NvCore::Container container;
+
/// Id to use for the next open file descriptor.
DeviceFD next_fd = 1;
@@ -108,9 +111,6 @@ private:
EventInterface events_interface;
- /// Manages syncpoints on the host
- NvCore::Container container;
-
std::unordered_map<std::string, std::function<FilesContainerType::iterator(DeviceFD)>> builders;
};